Rollup of 6 pull requests #107399

matthiaskrgr · 2023-01-28T04:20:17Z

Successful merges:

incremental: migrate diagnostics #100754 (incremental: migrate diagnostics)
Improve unexpected close and mismatch delimiter hint in TokenTreesReader #104012 (Improve unexpected close and mismatch delimiter hint in TokenTreesReader)
Stabilize the const_socketaddr feature #104252 (Stabilize the const_socketaddr feature)
Detect references to non-existant messages in Fluent resources #107096 (Detect references to non-existant messages in Fluent resources)
Add regression test for #60755 #107355 (Add regression test for Error when trying use trait alias for Fn() in impl #60755)
Remove BOOL_TY_FOR_UNIT_TESTING #107384 (Remove BOOL_TY_FOR_UNIT_TESTING)

Failed merges:

make ty::Ty: Debug not call the Display impl #107084 (make ty::Ty: Debug not call the Display impl)

r? @ghost
@rustbot modify labels: rollup

Support for emission of notes was added in f8ebc72 but `emit_note` and `create_note` functions weren't added to `Handler`. Signed-off-by: David Wood <david.wood@huawei.com>

Implement `IntoDiagnosticArg` for `&'a T` when `T` implements `IntoDiagnosticArg` and `Clone`. Makes it easier to write diagnostic structs that borrow something which implements `IntoDiagnosticArg`. Signed-off-by: David Wood <david.wood@huawei.com>

Forward the `Display` implementation for `CrateType` to `IntoDiagnosticArg` so that it can be used in diagnostic structs. Signed-off-by: David Wood <david.wood@huawei.com>

Apply the diagnostic migration lint to more functions on `Session`. Signed-off-by: David Wood <david.wood@huawei.com>

Migrate the `rustc_incremental` crate's diagnostics to translatable diagnostic structs. Signed-off-by: David Wood <david.wood@huawei.com>

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

It is not used anymore for unit testing.

… r=compiler-errors incremental: migrate diagnostics - Apply the diagnostic migration lints to more functions on `Session`, namely: `span_warn`, `span_warn_with_code`, `warn` `note_without_error`, `span_note_without_error`, `struct_note_without_error`. - Add impls of `IntoDiagnosticArg` for `std::io::Error`, `std::path::Path` and `std::path::PathBuf`. - Migrate the `rustc_incremental` crate's diagnostics to translatable diagnostic structs. r? ``@compiler-errors`` cc rust-lang#100717

…indentation, r=petrochenkov Improve unexpected close and mismatch delimiter hint in TokenTreesReader Fixes rust-lang#103882 Fixes rust-lang#68987 Fixes rust-lang#69259 The inner indentation mismatching will be covered by outer block, the new added function `report_error_prone_delim_block` will find out the error prone candidates for reporting.

…r=JohnTitor Stabilize the const_socketaddr feature Stabilizes `#![feature(const_socketaddr)]`. Tracking issue: rust-lang#82485 Closes rust-lang#82485 This has been unstably const for over a year now. And the code change simplifying the constness of the `new` constructors has been in stable Rust since 1.64 (a bit over a full release cycle). I'm not aware of any blockers to this stabilization.

…=compiler-errors Detect references to non-existant messages in Fluent resources Should help with cases like rust-lang#107091, where `{variable}` (a message reference) is accidentally typed, rather than `{$variable}` (a variable reference) Fixes rust-lang#107370 ``@rustbot`` label +A-translation

…errors Add regression test for rust-lang#60755 Closes rust-lang#60755 r? compiler-errors Signed-off-by: Yuki Okushi <jtitor@2k36.org>

…-obk Remove `BOOL_TY_FOR_UNIT_TESTING` It is not used anymore for unit testing.

matthiaskrgr · 2023-01-28T04:20:40Z

@bors r+ rollup=never p=6

bors · 2023-01-28T04:20:42Z

📌 Commit 9d1d9dc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-01-28T09:48:42Z

⌛ Testing commit 9d1d9dc with merge 796cfbbb7a43c425935595fa88d1a1c0dfbb96a7...

bors · 2023-01-28T10:00:50Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-01-28T10:03:16Z

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[TIMING] compile::Assemble { target_compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu } } -- 0.015
[TIMING] compile::StartupObjects { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: wasm32-unknown-unknown } -- 0.000
[TIMING] builder::Builder::sysroot_libdir::Libdir { compiler: Compiler { stage: 2, host: x86_64-unknown-linux-gnu }, target: wasm32-unknown-unknown } -- 0.000
Building stage2 library artifacts (x86_64-unknown-linux-gnu -> wasm32-unknown-unknown)
error: output of --print=file-names has changed in the compiler, cannot parse
command was: `/checkout/obj/build/bootstrap/debug/rustc - --crate-name ___ --print=file-names -Csymbol-mangling-version=legacy -Zunstable-options -Zunstable-options '--check-cfg=values(bootstrap)' '--check-cfg=values(stdarch_intel_sde)' '--check-cfg=values(no_fp_fmt_parse)' '--check-cfg=values(no_global_oom_handling)' '--check-cfg=values(no_rc)' '--check-cfg=values(no_sync)' '--check-cfg=values(freebsd12)' '--check-cfg=values(backtrace_in_libstd)' '--check-cfg=values(target_env,"libnx")' '--check-cfg=values(target_os,"watchos")' '--check-cfg=values(target_arch,"asmjs","spirv","nvptx","nvptx64","le32","xtensa")' '--check-cfg=values(dont_compile_me)' '--check-cfg=values(rustix_use_libc)' -Zmacro-backtrace -Zunstable-options -Csplit-debuginfo=off -Cprefer-dynamic -Cembed-bitcode=yes '-Zcrate-attr=doc(html_root_url="https://doc.rust-lang.org/nightly/")' --target wasm32-unknown-unknown --crate-type bin --crate-type rlib --crate-type dylib --crate-type cdylib --crate-type staticlib --crate-type proc-macro --print=sysroot --print=cfg`
--- stdout
___.wasm
___.wasm
lib___.rlib
___.wasm
lib___.a
/checkout/obj/build/x86_64-unknown-linux-gnu/stage2
debug_assertions
panic="abort"
panic="abort"
proc_macro
target_abi=""
target_arch="wasm32"
target_endian="little"
target_env=""
target_family="wasm"
target_feature="llvm14-builtins-abi"
target_has_atomic="16"
target_has_atomic="32"
target_has_atomic="64"
target_has_atomic="8"
target_has_atomic="8"
target_has_atomic="ptr"
target_has_atomic_equal_alignment="16"
target_has_atomic_equal_alignment="32"
target_has_atomic_equal_alignment="64"
target_has_atomic_equal_alignment="8"
target_has_atomic_equal_alignment="ptr"
target_has_atomic_load_store="16"
target_has_atomic_load_store="32"
target_has_atomic_load_store="64"
target_has_atomic_load_store="8"
target_has_atomic_load_store="8"
target_has_atomic_load_store="ptr"
target_os="unknown"
target_pointer_width="32"
target_thread_local
target_vendor="unknown"
--- stderr
warning: dropping unsupported crate type `dylib` for target `wasm32-unknown-unknown`

warning: 1 warning emitted
warning: 1 warning emitted

[RUSTC-TIMING] ___ test:false 0.022

faern and others added 19 commits January 25, 2023 22:23

Stabilize the const_socketaddr feature

50f29d4

add testcase for rust-lang#104012

c4d00d7

Improve unexpected close and mismatch delimiter hint in TokenTreesReader

cd23323

errors: add emit_note/create_note on Handler

fe29317

Support for emission of notes was added in f8ebc72 but `emit_note` and `create_note` functions weren't added to `Handler`. Signed-off-by: David Wood <david.wood@huawei.com>

session: impl IntoDiagnosticArg for CrateType

0222a46

Forward the `Display` implementation for `CrateType` to `IntoDiagnosticArg` so that it can be used in diagnostic structs. Signed-off-by: David Wood <david.wood@huawei.com>

session: diagnostic migration lint on more fns

089e1d8

Apply the diagnostic migration lint to more functions on `Session`. Signed-off-by: David Wood <david.wood@huawei.com>

incremental: migrate diagnostics

af8ec72

Migrate the `rustc_incremental` crate's diagnostics to translatable diagnostic structs. Signed-off-by: David Wood <david.wood@huawei.com>

Add regression test for rust-lang#60755

dbe911f

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Detect references to non-existant messages in Fluent resources

ed707a1

Fix some Fluent typos

0ae0d87

Remove BOOL_TY_FOR_UNIT_TESTING

454c473

It is not used anymore for unit testing.

Remove unused import

5152e84

Rollup merge of rust-lang#107355 - JohnTitor:issue-60755, r=compiler-…

d78e09b

…errors Add regression test for rust-lang#60755 Closes rust-lang#60755 r? compiler-errors Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Rollup merge of rust-lang#107384 - Nilstrieb:bool-for-deletion, r=oli…

9d1d9dc

…-obk Remove `BOOL_TY_FOR_UNIT_TESTING` It is not used anymore for unit testing.

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 28, 2023

matthiaskrgr closed this Jan 28, 2023

matthiaskrgr deleted the rollup-g2a9g4n branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #107399

Rollup of 6 pull requests #107399

matthiaskrgr commented Jan 28, 2023

matthiaskrgr commented Jan 28, 2023

bors commented Jan 28, 2023

bors commented Jan 28, 2023

bors commented Jan 28, 2023

rust-log-analyzer commented Jan 28, 2023

Rollup of 6 pull requests #107399

Rollup of 6 pull requests #107399

Conversation

matthiaskrgr commented Jan 28, 2023

matthiaskrgr commented Jan 28, 2023

bors commented Jan 28, 2023

bors commented Jan 28, 2023

bors commented Jan 28, 2023

rust-log-analyzer commented Jan 28, 2023